Force PAE build of Xen by specifying 'pae=y' to make, or

by setting XEN_TARGET_X86_PAE=y (e.g., in Config.mk).
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/Config.mk b/Config.mk
index 390a9b3abedea5fdc3854ab25a53a608884b4855..facf5ec1236a48778740f819f21fcee3da5e4c09 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -3,6 +3,7 @@
 # Currently supported architectures: x86_32, x86_64
 XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
 XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
+XEN_TARGET_X86_PAE  ?= n
 
 # Tools to run on system hosting the build
 HOSTCC     = gcc

diff --git a/Makefile b/Makefile
index ebba9ffe9c8902c6d3d2829e7731a41109562171..5545aa4977b81a3d06c26de556d6dfcc0b0e7d37 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,6 +31,10 @@ all: dist
 include Config.mk
 include buildconfigs/Rules.mk
 
+ifeq ($(XEN_TARGET_X86_PAE),y)
+export pae=y
+endif
+
 .PHONY:        all dist install xen tools kernels docs world clean mkpatches mrproper
 .PHONY:        kbuild kdelete kclean
 

diff --git a/xen/Rules.mk b/xen/Rules.mk
index 751bf460d38de9029f43c959b4e3c551d3f61f9e..d14d3880170c3d1d5556c749a51325cb99f4fc67 100644 (file)
--- a/xen/Rules.mk
+++ b/xen/Rules.mk
@@ -51,7 +51,6 @@ ALL_OBJS += $(BASEDIR)/acm/acm.o
 endif
 ALL_OBJS += $(BASEDIR)/arch/$(TARGET_ARCH)/arch.o
 
-
 test-gcc-flag = $(shell $(CC) -v --help 2>&1 | grep -q " $(1) " && echo $(1))
 
 include $(BASEDIR)/arch/$(TARGET_ARCH)/Rules.mk
@@ -91,4 +90,3 @@ CFLAGS := $(strip $(CFLAGS))
 
 %.o: %.S $(HDRS) Makefile
        $(CC) $(CFLAGS) -D__ASSEMBLY__ -c $< -o $@
-

diff --git a/xen/arch/x86/Rules.mk b/xen/arch/x86/Rules.mk
index 647640797d45946f3f9b05cb09e6deb510632638..0675d763cda0e726e0192a2e16a862cf05b03510 100644 (file)
--- a/xen/arch/x86/Rules.mk
+++ b/xen/arch/x86/Rules.mk
@@ -1,6 +1,12 @@
 ########################################
 # x86-specific definitions
 
+#
+# If you change any of these configuration options then you must
+# 'make clean' before rebuilding.
+#
+pae ?= n
+
 CFLAGS  += -nostdinc -fno-builtin -fno-common -fno-strict-aliasing
 CFLAGS  += -iwithprefix include -Wall -Werror -Wno-pointer-arith -pipe
 CFLAGS  += -I$(BASEDIR)/include 
@@ -24,6 +30,9 @@ CFLAGS  += $(call test-gcc-flag,-fno-stack-protector-all)
 ifeq ($(TARGET_SUBARCH),x86_32)
 CFLAGS  += -m32 -march=i686
 LDFLAGS += -m elf_i386 
+ifeq ($(pae),y)
+CFLAGS  += -DCONFIG_X86_PAE=1
+endif
 endif
 
 ifeq ($(TARGET_SUBARCH),x86_64)